reference file relocation. (#506)

move geocaching.loc into reference directory.
use ${REFERENCE} to find reference files.  not reference.  not nothing.

diff --git a/geocaching.loc b/geocaching.loc
deleted file mode 100644 (file)
index 4073f2c..0000000
--- a/geocaching.loc
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0"?><loc version="1.0" src="EasyGPS"><waypoint><name id="GCEBB"><![CDATA[Mountain Bike Heaven by susy1313]]></name><coord lat="35.9720333333333" lon="-87.1347"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=3771</link></waypoint><waypoint><name id="GC1A37"><![CDATA[The Troll by a182pilot & Family]]></name><coord lat="36.0906833333333" lon="-86.67955"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=6711</link></waypoint><waypoint><name id="GC1C2B"><![CDATA[Dive Bomber by JoGPS & family]]></name><coord lat="35.9962666666667" lon="-86.6201166666667"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=7211</link></waypoint><waypoint><name id="GC25A9"><![CDATA[FOSTER by JoGPS & Family]]></name><coord lat="36.0384833333333" lon="-86.6486166666667"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=9641</link></waypoint><waypoint><name id="GC2723"><![CDATA[Logan Lighthouse by JoGps & Family]]></name><coord lat="36.1121833333333" lon="-86.7417666666667"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=10019</link></waypoint><waypoint><name id="GC2B71"><![CDATA[Ganier Cache by Susy1313]]></name><coord lat="36.0640833333333" lon="-86.7905166666667"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=11121</link></waypoint><waypoint><name id="GC309F"><![CDATA[Shy's Hill by FireFighterEng33]]></name><coord lat="36.0877666666667" lon="-86.8097333333333"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=12447</link></waypoint><waypoint><name id="GC317A"><![CDATA[GittyUp by JoGPS / Warner Parks]]></name><coord lat="36.0575" lon="-86.892"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=12666</link></waypoint><waypoint><name id="GC317D"><![CDATA[Inlighting by JoGPS / Warner Parks]]></name><coord lat="36.0828" lon="-86.8672833333333"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=12669</link></waypoint></loc>
\ No newline at end of file

diff --git a/reference/geocaching.loc b/reference/geocaching.loc
new file mode 100644 (file)
index 0000000..4073f2c
--- /dev/null
+++ b/reference/geocaching.loc
@@ -0,0 +1 @@
+<?xml version="1.0"?><loc version="1.0" src="EasyGPS"><waypoint><name id="GCEBB"><![CDATA[Mountain Bike Heaven by susy1313]]></name><coord lat="35.9720333333333" lon="-87.1347"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=3771</link></waypoint><waypoint><name id="GC1A37"><![CDATA[The Troll by a182pilot & Family]]></name><coord lat="36.0906833333333" lon="-86.67955"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=6711</link></waypoint><waypoint><name id="GC1C2B"><![CDATA[Dive Bomber by JoGPS & family]]></name><coord lat="35.9962666666667" lon="-86.6201166666667"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=7211</link></waypoint><waypoint><name id="GC25A9"><![CDATA[FOSTER by JoGPS & Family]]></name><coord lat="36.0384833333333" lon="-86.6486166666667"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=9641</link></waypoint><waypoint><name id="GC2723"><![CDATA[Logan Lighthouse by JoGps & Family]]></name><coord lat="36.1121833333333" lon="-86.7417666666667"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=10019</link></waypoint><waypoint><name id="GC2B71"><![CDATA[Ganier Cache by Susy1313]]></name><coord lat="36.0640833333333" lon="-86.7905166666667"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=11121</link></waypoint><waypoint><name id="GC309F"><![CDATA[Shy's Hill by FireFighterEng33]]></name><coord lat="36.0877666666667" lon="-86.8097333333333"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=12447</link></waypoint><waypoint><name id="GC317A"><![CDATA[GittyUp by JoGPS / Warner Parks]]></name><coord lat="36.0575" lon="-86.892"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=12666</link></waypoint><waypoint><name id="GC317D"><![CDATA[Inlighting by JoGPS / Warner Parks]]></name><coord lat="36.0828" lon="-86.8672833333333"/><type>geocache</type><link text="Cache Details">http://www.geocaching.com/seek/cache_details.asp?ID=12669</link></waypoint></loc>
\ No newline at end of file

diff --git a/testo.d/classic-2.test b/testo.d/classic-2.test
index 2102c3cfafd882749e5158c2d4611d0eabd31b3b..8bcaf9115a02d007c0592bd3e9f5df1bc495aa57 100644 (file)
--- a/testo.d/classic-2.test
+++ b/testo.d/classic-2.test
@@ -20,21 +20,21 @@ compare ${REFERENCE}/dusky.gnuplot ${TMPDIR}/pathdist.out
 # it.
 #
 
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc  -o tabsep -F ${TMPDIR}/tabsep.in
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc  -o tabsep -F ${TMPDIR}/tabsep.in
 gpsbabel -i tabsep -f ${TMPDIR}/tabsep.in -o geo -F ${TMPDIR}/tabsep.out
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc  -o geo -F ${TMPDIR}/geotabsep.out
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc  -o geo -F ${TMPDIR}/geotabsep.out
 compare ${TMPDIR}/tabsep.out ${TMPDIR}/geotabsep.out
 
 #
 # Now do the same for custom - it has the same issues.
 #
 
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc  -o custom -F ${TMPDIR}/custom.in
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc  -o custom -F ${TMPDIR}/custom.in
 gpsbabel -i custom -f ${TMPDIR}/custom.in -o geo -F ${TMPDIR}/custom.out
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc  -o geo -F ${TMPDIR}/geocustom.out
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc  -o geo -F ${TMPDIR}/geocustom.out
 
 #
 # Write something to the various output-only formats
 #
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o text -F ${TMPDIR}/text.out -o html -F ${TMPDIR}/html.out -o vcard -F ${TMPDIR}/vcard.out #-o palmdoc -F ${TMPDIR}/pd.out
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o text -F ${TMPDIR}/text.out -o html -F ${TMPDIR}/html.out -o vcard -F ${TMPDIR}/vcard.out #-o palmdoc -F ${TMPDIR}/pd.out
 

diff --git a/testo.d/csv.test b/testo.d/csv.test
index ebc156c2a1e129b44e5d9a8ec832c4e5ad7c0fa9..4bd2107ede5442bebd8da438c9d95634685f8ea6 100644 (file)
--- a/testo.d/csv.test
+++ b/testo.d/csv.test
@@ -1,7 +1,7 @@
 
 # CSV (Comma separated value) data.
 
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o csv -F ${TMPDIR}/csv.csv
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o csv -F ${TMPDIR}/csv.csv
 gpsbabel -i csv -f ${TMPDIR}/csv.csv -o csv -F ${TMPDIR}/csv2.csv
 compare ${TMPDIR}/csv2.csv ${TMPDIR}/csv.csv 
 # And the alternate command line version.

diff --git a/testo.d/duplicate.test b/testo.d/duplicate.test
index cd3b65511b0bbe60a6cf66e2bede113b2ce9f586..c6dad28aba7ef9b6e230eb3e47647760ea680a5a 100644 (file)
--- a/testo.d/duplicate.test
+++ b/testo.d/duplicate.test
@@ -3,7 +3,7 @@
 # as an intermediate format for testing the filter.
 #
 rm -f ${TMPDIR}/filterdupe.csv1 ${TMPDIR}/filterdupe.csv2
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o csv -F ${TMPDIR}/filterdupe.csv1
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -f ${REFERENCE}/../geocaching.loc -x duplicate,shortname \
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o csv -F ${TMPDIR}/filterdupe.csv1
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -f ${REFERENCE}/geocaching.loc -x duplicate,shortname \
                -o csv -F ${TMPDIR}/filterdupe.csv2
 sort_and_compare ${TMPDIR}/filterdupe.csv1 ${TMPDIR}/filterdupe.csv2

diff --git a/testo.d/fugawi.test b/testo.d/fugawi.test
index f123b954107e3eaee39c21409c1eb2494c7e406b..51ea230262a23761fe6121478c170d67e0a8c6a9 100644 (file)
--- a/testo.d/fugawi.test
+++ b/testo.d/fugawi.test
@@ -3,7 +3,7 @@
 rm -f ${TMPDIR}/fugawi*
 gpsbabel -i fugawi -f ${REFERENCE}/fugawi.notime.txt -o fugawi -F ${TMPDIR}/fugawi1.txt
 compare ${REFERENCE}/fugawi.ref.txt ${TMPDIR}/fugawi1.txt
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o fugawi -F ${TMPDIR}/fugawi2.txt
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o fugawi -F ${TMPDIR}/fugawi2.txt
 compare ${REFERENCE}/fugawi.ref.txt ${TMPDIR}/fugawi2.txt
 gpsbabel -i fugawi -f ${TMPDIR}/fugawi2.txt -o fugawi -F ${TMPDIR}/fugawi3.txt
 compare ${TMPDIR}/fugawi2.txt ${TMPDIR}/fugawi3.txt

diff --git a/testo.d/geo.test b/testo.d/geo.test
index c5dbe797890011ab8e4b1e40ea23a9a56f6188a6..1bd748d19407a7e4a36b0a703df9b64e323abfec 100644 (file)
--- a/testo.d/geo.test
+++ b/testo.d/geo.test
@@ -1,10 +1,10 @@
 
 # Geocaching .loc
 rm -f ${TMPDIR}/gl.loc
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o geo -F ${TMPDIR}/gl.loc
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o geo -F ${TMPDIR}/gl.loc
 compare ${TMPDIR}/gl.loc ${REFERENCE}
 
 # we have a one off reader in geo, make sure it can read stdin.
 rm -f ${TMPDIR}/gl_si.loc
-cat ${REFERENCE}/../geocaching.loc | gpsbabel -i geo -f - -o geo -F ${TMPDIR}/gl_si.loc
+cat ${REFERENCE}/geocaching.loc | gpsbabel -i geo -f - -o geo -F ${TMPDIR}/gl_si.loc
 compare ${TMPDIR}/gl_si.loc ${REFERENCE}/gl.loc

diff --git a/testo.d/gpsdrive.test b/testo.d/gpsdrive.test
index 549d8cb13721dc9ec7c0327a51eaae95b4c658be..324d0994154673c783581f3c258f2ae8916e3220 100644 (file)
--- a/testo.d/gpsdrive.test
+++ b/testo.d/gpsdrive.test
@@ -1,6 +1,6 @@
 # GpsDrive
 rm -f ${TMPDIR}/gpsdrive.txt
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o gpsdrive -F ${TMPDIR}/gpsdrive.txt
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o gpsdrive -F ${TMPDIR}/gpsdrive.txt
 compare ${TMPDIR}/gpsdrive.txt ${REFERENCE}
 gpsbabel -i gpsdrive -f ${REFERENCE}/gpsdrive.txt -o gpsdrive -F ${TMPDIR}/gpsdrive2.txt
 compare ${REFERENCE}/gpsdrive.txt ${TMPDIR}/gpsdrive2.txt

diff --git a/testo.d/gpsman.test b/testo.d/gpsman.test
index 98109207904d868a683ce810dcb7d5471074a50a..1c131d6be5028d08725ff96c6363be3efac01509 100644 (file)
--- a/testo.d/gpsman.test
+++ b/testo.d/gpsman.test
@@ -1,6 +1,6 @@
 
 # GPSman 
 rm -f ${TMPDIR}/gm.gm ${TMPDIR}/gm.gm+
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o gpsman -F ${TMPDIR}/gm.gm -o gpsutil -F ${TMPDIR}/gu.wpt
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o gpsman -F ${TMPDIR}/gm.gm -o gpsutil -F ${TMPDIR}/gu.wpt
 gpsbabel -i gpsman -f ${TMPDIR}/gm.gm -o gpsutil -F ${TMPDIR}/gm.gm+
 compare ${TMPDIR}/gm.gm+ ${TMPDIR}/gu.wpt

diff --git a/testo.d/gpssim.test b/testo.d/gpssim.test
index d441ea6b239865770a42e7b905d6566d8cb22cd8..b4e64141c1d58276fd76a966699b8bc27b320949 100644 (file)
--- a/testo.d/gpssim.test
+++ b/testo.d/gpssim.test
@@ -1,7 +1,7 @@
 #
 # Franson GPSGate simulation
 #
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o gpssim -F ${TMPDIR}/waypoints.gpssim
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o gpssim -F ${TMPDIR}/waypoints.gpssim
 compare ${TMPDIR}/waypoints.gpssim ${REFERENCE}
 gpsbabel -i gpx -f ${REFERENCE}/track/tracks.gpx -o gpssim -F ${TMPDIR}/tracks.gpssim
 compare ${TMPDIR}/tracks.gpssim ${REFERENCE}/track

diff --git a/testo.d/gpsutil.test b/testo.d/gpsutil.test
index 29f92bab2d0d5c602e133a6442fbb09f94a8bfc4..a587e87230de971b13d1ed9dee221ad1d33de3c1 100644 (file)
--- a/testo.d/gpsutil.test
+++ b/testo.d/gpsutil.test
@@ -1,6 +1,6 @@
 # GPSUtil
 rm -f ${TMPDIR}/gu.wpt ${TMPDIR}/1.gpx ${TMPDIR}/2.gpx
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o gpsutil -F ${TMPDIR}/gu.wpt
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o gpsutil -F ${TMPDIR}/gu.wpt
 compare ${TMPDIR}/gu.wpt ${REFERENCE}
 gpsbabel -i gpsutil -f ${TMPDIR}/gu.wpt -o gpx -F ${TMPDIR}/1.gpx
 gpsbabel -i gpsutil -f ${REFERENCE}/gu.wpt -o gpx -F ${TMPDIR}/2.gpx

diff --git a/testo.d/gpx.test b/testo.d/gpx.test
index 0caf836bf682b9fd36b3474eb2cf3954c90ac4e2..19ca6c83ba8d1da0111eac131608a8499e24749f 100644 (file)
--- a/testo.d/gpx.test
+++ b/testo.d/gpx.test
@@ -1,8 +1,8 @@
 
 # GPX
 rm -f ${TMPDIR}/gl.gpx ${TMPDIR}/gpx.wpt
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o gpsman -F ${TMPDIR}/gm.gm -o gpsutil -F ${TMPDIR}/gu.wpt
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o gpx -F ${TMPDIR}/gl.gpx
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o gpsman -F ${TMPDIR}/gm.gm -o gpsutil -F ${TMPDIR}/gu.wpt
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o gpx -F ${TMPDIR}/gl.gpx
 gpsbabel -i gpx -f ${TMPDIR}/gl.gpx -o gpsutil -F ${TMPDIR}/gpx.wpt
 compare ${TMPDIR}/gpx.wpt ${TMPDIR}/gu.wpt
 

diff --git a/testo.d/kml-read.test b/testo.d/kml-read.test
index 65271ad0cb60f545f82f9604f24d0146ad934a70..fbca3c5dd1f4b2c6bfaf8ae7b522ea4c7dff02c4 100644 (file)
--- a/testo.d/kml-read.test
+++ b/testo.d/kml-read.test
@@ -3,7 +3,7 @@
 # as real world usage shows our writer is more frequently used than our
 # reader.
 
-# gpsbabel -i geo -f geocaching.loc -o unicsv -F ${TMPDIR}/geocaching.txt
+# gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o unicsv -F ${TMPDIR}/geocaching.txt
 gpsbabel -i kml -f ${REFERENCE}/kml-points.kml -o unicsv -F ${TMPDIR}/geo~unicsv.txt
 compare ${REFERENCE}/kml-points.txt ${TMPDIR}/geo~unicsv.txt
 

diff --git a/testo.d/lowranceusr.test b/testo.d/lowranceusr.test
index ee13bfc6d90bc8866e3be5765a57365921fc00c0..e35692ffa0cc7fbfa2d24935d2655eb11292b2c8 100644 (file)
--- a/testo.d/lowranceusr.test
+++ b/testo.d/lowranceusr.test
@@ -67,7 +67,7 @@
 rm -f ${TMPDIR}/lowrance*
 
 # Test ability to read non-Lowrance format and generate USR v2 file
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o lowranceusr,wversion=2 -F ${TMPDIR}/lowrance1.usr
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o lowranceusr,wversion=2 -F ${TMPDIR}/lowrance1.usr
 bincompare ${REFERENCE}/lowrance.usr ${TMPDIR}/lowrance1.usr
 
 # Use the file just created to see if can write back the same data

diff --git a/testo.d/mapsend.test b/testo.d/mapsend.test
index f9e62aa82a642a5e6ee138cc8b7031a5ed9ba777..ff367e678a02ee9ea21ef9dce07646542b58e3ce 100644 (file)
--- a/testo.d/mapsend.test
+++ b/testo.d/mapsend.test
@@ -1,6 +1,6 @@
 # Magellan Mapsend
 rm -f ${TMPDIR}/mm.mapsend ${TMPDIR}/mm.gps
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o mapsend -F ${TMPDIR}/mm.mapsend
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o mapsend -F ${TMPDIR}/mm.mapsend
 gpsbabel -i mapsend -f ${TMPDIR}/mm.mapsend -o gpsutil -F ${TMPDIR}/mm.gps
 compare ${TMPDIR}/mm.gps ${REFERENCE}/gu.wpt
 

diff --git a/testo.d/nmea.test b/testo.d/nmea.test
index 1c530f09742573241b834ecd0e6c804c689886f2..169682979eb0ee2143a0e308ae53067da7fcd86a 100644 (file)
--- a/testo.d/nmea.test
+++ b/testo.d/nmea.test
@@ -15,7 +15,7 @@ compare ${REFERENCE}/track/amod.gpx ${TMPDIR}/amod-out.gpx
 compare ${REFERENCE}/track/amod-cleansed ${TMPDIR}/amod-pure
 
 # Test GPWPL waypoints.  Verify we can write first.
-gpsbabel -i geo -f geocaching.loc -o nmea -F ${TMPDIR}/waypoints.nmea
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o nmea -F ${TMPDIR}/waypoints.nmea
 compare ${REFERENCE}/waypoints.nmea ${TMPDIR}/waypoints.nmea 
 # Now read our reference file and prove that our writer will make one to match.
 gpsbabel -i nmea -f ${REFERENCE}/waypoints.nmea -o nmea -F ${TMPDIR}/wayout.nmea

diff --git a/testo.d/position.test b/testo.d/position.test
index bd59ae995dad367cc5c1985b6fc45d8bd03372c7..90e66e44ee1786684eb535134952d387c9a6548f 100644 (file)
--- a/testo.d/position.test
+++ b/testo.d/position.test
@@ -4,11 +4,11 @@
 # position filter, we can test very similarly to the duplicate filter.
 #
 rm -f ${TMPDIR}/filterpos.csv1 ${TMPDIR}/filterpos.csv2
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o csv -F ${TMPDIR}/filterpos.csv1
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -f ${REFERENCE}/../geocaching.loc -x position,distance=5f \
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o csv -F ${TMPDIR}/filterpos.csv1
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -f ${REFERENCE}/geocaching.loc -x position,distance=5f \
                -o csv -F ${TMPDIR}/filterpos.csv2
 sort_and_compare ${TMPDIR}/filterpos.csv1 ${TMPDIR}/filterpos.csv2
 
 # check a track that loops back with a return leg adjacent to an outgoing leg.
-gpsbabel -i gpx -f reference/track/position_track.gpx -x position,distance=12m -o gpx -F ${TMPDIR}/position_track_filtered.gpx
+gpsbabel -i gpx -f ${REFERENCE}/track/position_track.gpx -x position,distance=12m -o gpx -F ${TMPDIR}/position_track_filtered.gpx
 compare ${REFERENCE}/track/position_track_filtered.gpx ${TMPDIR}/position_track_filtered.gpx

diff --git a/testo.d/radius.test b/testo.d/radius.test
index 82675c88b7688a2593ede22aa53bbd33a3022897..70c3a400c7dbd1359467cf7f2f8204ae40e44d93 100644 (file)
--- a/testo.d/radius.test
+++ b/testo.d/radius.test
@@ -3,7 +3,7 @@
 # Radius filter
 #
 rm -f ${TMPDIR}/radius.csv
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc \
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc \
                -x radius,lat=35.9720,lon=-87.1347,distance=14.7 \
                -o csv -F ${TMPDIR}/radius.csv
 compare ${TMPDIR}/radius.csv ${REFERENCE}

diff --git a/testo.d/stackfilter.test b/testo.d/stackfilter.test
index 25ab1b89b84f9707a90ffb0cca72f035e39624af..e1a48e3d073db222541a43acaeb8a4aa9947366d 100644 (file)
--- a/testo.d/stackfilter.test
+++ b/testo.d/stackfilter.test
@@ -5,9 +5,9 @@
 # exercise all of the currently-extant filter code.
 #
 
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -x stack,push,copy,nowarn -x stack,push,copy -x stack,push -x stack,pop,replace -x stack,pop,append -x stack,push,copy -x stack,pop,discard -x stack,swap,depth=1 -o arc -F ${TMPDIR}/stackfilt.txt
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -x stack,push,copy,nowarn -x stack,push,copy -x stack,push -x stack,pop,replace -x stack,pop,append -x stack,push,copy -x stack,pop,discard -x stack,swap,depth=1 -o arc -F ${TMPDIR}/stackfilt.txt
 
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -x transform,rte=wpt,del -x stack,push,copy,nowarn -x stack,push,copy -x stack,push -x stack,pop,replace -x stack,pop,append -x stack,push,copy -x stack,pop,discard -x stack,swap,depth=1 -o arc -F ${TMPDIR}/stackfilt.txt
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -x transform,rte=wpt,del -x stack,push,copy,nowarn -x stack,push,copy -x stack,push -x stack,pop,replace -x stack,pop,append -x stack,push,copy -x stack,pop,discard -x stack,swap,depth=1 -o arc -F ${TMPDIR}/stackfilt.txt
 
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -x transform,trk=wpt,del -x stack,push,copy,nowarn -x stack,push,copy -x stack,push -x stack,pop,replace -x stack,pop,append -x stack,push,copy -x stack,pop,discard -x stack,swap,depth=1 -o arc -F ${TMPDIR}/stackfilt.txt
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -x transform,trk=wpt,del -x stack,push,copy,nowarn -x stack,push,copy -x stack,push -x stack,pop,replace -x stack,pop,append -x stack,push,copy -x stack,pop,discard -x stack,swap,depth=1 -o arc -F ${TMPDIR}/stackfilt.txt
 

diff --git a/testo.d/tiger.test b/testo.d/tiger.test
index 71b3c458fe3135e2a4decf4506033fd8a48db003..c42ea3917bc70c2ae0a6188bd0525d7903f6f92a 100644 (file)
--- a/testo.d/tiger.test
+++ b/testo.d/tiger.test
@@ -3,6 +3,6 @@
 # so we simply test we can write it, and then read it and write it and
 # get an identical file back.
 rm -f ${TMPDIR}/tiger
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o tiger -F ${TMPDIR}/tiger
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o tiger -F ${TMPDIR}/tiger
 gpsbabel -i tiger -f ${TMPDIR}/tiger -o tiger -F ${TMPDIR}/tiger2
 compare ${TMPDIR}/tiger ${TMPDIR}/tiger2

diff --git a/testo.d/tpg.test b/testo.d/tpg.test
index 312ea4626cd8f987ae35e5c4de56ee9d45579eea..132450e6857aaf6d13e06edb6e5239f9b889b33e 100644 (file)
--- a/testo.d/tpg.test
+++ b/testo.d/tpg.test
@@ -5,7 +5,7 @@
 # against a format that rounds higher than we care to compare
 # for binary data. 
 rm -f ${TMPDIR}/topo.mxf ${TMPDIR}/tpg.mxf ${TMPDIR}/geo.tpg
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o tpg -F ${TMPDIR}/geo.tpg
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o tpg -F ${TMPDIR}/geo.tpg
 gpsbabel -i tpg -f ${TMPDIR}/geo.tpg -o mxf -F ${TMPDIR}/tpg.mxf
 gpsbabel -i tpg -f ${REFERENCE}/tpg.tpg -o mxf -F ${TMPDIR}/topo.mxf
 compare ${TMPDIR}/tpg.mxf ${TMPDIR}/topo.mxf

diff --git a/testo.d/track-discard.test b/testo.d/track-discard.test
index 5145d1f04409a795cdbc8f43390e5d630663112f..539b164787199c29a2573058447cbb5503a9c32a 100644 (file)
--- a/testo.d/track-discard.test
+++ b/testo.d/track-discard.test
@@ -17,11 +17,11 @@ gpsbabel -t -i gpx -f ${REFERENCE}/track/trackfilter_discard.gpx -x track,merge,
 compare ${REFERENCE}/track/trackfilter_discard_out.gpx ${TMPDIR}/discard.gpx
 
 # This file has ONLY names starting with GC; verify we toss all.
-gpsbabel -i geo -f geocaching.loc  -x discard,matchname=GC* -o csv -F ${TMPDIR}/discardgc.geo
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc  -x discard,matchname=GC* -o csv -F ${TMPDIR}/discardgc.geo
 compare ${TMPDIR}/discardgc.geo /dev/null
 
 # Throw out all caches from Joe
-gpsbabel -i geo -f geocaching.loc  -x discard,matchdesc=JoGPS -o csv -F ${TMPDIR}/discardjoe.csv
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc  -x discard,matchdesc=JoGPS -o csv -F ${TMPDIR}/discardjoe.csv
 nlines=$(wc -l ${TMPDIR}/discardjoe.csv | awk '{print $1}')
 if [ $nlines -ne 4 ];
 then

diff --git a/testo.d/xcsv.test b/testo.d/xcsv.test
index 7fe41655323a2f839ed60ce11413a0dd4167f7e5..a356f63ebea33dfa8d323dc0e1e88ae99a091703 100644 (file)
--- a/testo.d/xcsv.test
+++ b/testo.d/xcsv.test
@@ -11,7 +11,7 @@ echo "IFIELD SHORTNAME,,%s" >> ${TMPDIR}/testo.style
 echo "IFIELD LAT_DIRDECIMAL,,%c%lf" >> ${TMPDIR}/testo.style
 echo "IFIELD LON_DECIMALDIR,,%lf%c" >> ${TMPDIR}/testo.style
 rm -f ${TMPDIR}/xcsv.geo ${TMPDIR}/xcsv.xcsv
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o xcsv,style=${TMPDIR}/testo.style -F ${TMPDIR}/xcsv.geo
+gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o xcsv,style=${TMPDIR}/testo.style -F ${TMPDIR}/xcsv.geo
 gpsbabel -i xcsv,style=${TMPDIR}/testo.style -f ${TMPDIR}/xcsv.geo -o xcsv,style=${TMPDIR}/testo.style -F ${TMPDIR}/xcsv.xcsv
 compare ${TMPDIR}/xcsv.geo ${TMPDIR}/xcsv.xcsv